*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f28aac05b4f01a94c16b9398d5ab3e38f9f6c108..b135c84b2cf1882614c1673b84333d3cd426fd8a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2007-06-12  Davis Herring  <herring@lanl.gov>
+
+       * desktop.el (desktop-save-mode-off): New function.
+       (desktop-base-lock-name, desktop-not-loaded-hook): New variables.
+       (desktop-full-lock-name, desktop-file-modtime, desktop-owner)
+       (desktop-claim-lock, desktop-release-lock): New functions.
+       (desktop-kill): Tell `desktop-save' that this is the last save.
+       Release the lock afterwards.
+       (desktop-buffer-info): New function.
+       (desktop-save): Use it.  Run `desktop-save-hook' where the doc
+       says to.  Detect conflicts, and manage the lock.
+       (desktop-read): Detect conflicts.  Manage the lock.
+
 2007-06-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emulation/tpu-mapper.el (tpu-emacs-map-key): Use new keymap names.